Autogenerated HTML docs for v1.7.5.1-249-gdbe9c
diff --git a/RelNotes/1.7.6.txt b/RelNotes/1.7.6.txt index 8554918..f73a7b2 100644 --- a/RelNotes/1.7.6.txt +++ b/RelNotes/1.7.6.txt
@@ -6,6 +6,8 @@ * Various git-svn updates. + * Updates the way content tags are handled in gitweb. + * Clean-up of the C part of i18n (but not l10n---please wait) continues. @@ -38,8 +40,8 @@ * "git merge" learned "-" as a short-hand for "the previous branch", just like the way "git checkout -" works. - * "git merge-one-file" learned to honor GIT_WORK_TREE settings when - handling "both sides added, differently" conflict. + * "git rebase" that does not specify on top of which branch to rebase + the current branch now uses @{upstream} of the current branch. * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked commits separately, producing more a useful output. @@ -64,6 +66,10 @@ Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are included in this release. + * "git add -p" did not work correctly when a hunk is split and then + one of them was given to the editor. + (merge jc/maint-add-p-overlapping-hunks later) + * "git config" used to choke with an insanely long line. (merge ef/maint-strbuf-init later) @@ -84,6 +90,15 @@ From: "Junio C. Hamano" <jch@example.com>). (merge jk/format-patch-quote-special-in-from later) + * In "git merge", per-branch branch.<name>.mergeoptions configuration + variables did not override the fallback default merge.<option> + configuration variables such as merge.ff, merge.log, etc. + (merge jc/maint-branch-mergeoptions later) + + * "git merge-one-file" did not honor GIT_WORK_TREE settings when + handling a "both sides added, differently" conflict. + (merge jk/merge-one-file-working-tree later) + * "git mergetool" did not handle conflicted submoudules gracefully. (merge jm/mergetool-submodules later) @@ -102,5 +117,5 @@ --- exec >/var/tmp/1 echo O=$(git describe master) -O=v1.7.5.1-216-g3970fc5 +O=v1.7.5.1-248-ga579498 git shortlog --no-merges ^maint ^$O master diff --git a/config.txt b/config.txt index c96aec1..285c7f7 100644 --- a/config.txt +++ b/config.txt
@@ -1309,8 +1309,9 @@ interactive.singlekey:: In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). - Currently this is used only by the `\--patch` mode of - linkgit:git-add[1]. Note that this setting is silently + Currently this is used by the `\--patch` mode of + linkgit:git-add[1], linkgit:git-reset[1], linkgit:git-stash[1] and + linkgit:git-checkout[1]. Note that this setting is silently ignored if portable keystroke input is not available. log.date::
diff --git a/git-add.html b/git-add.html index 44238ce..3b54692 100644 --- a/git-add.html +++ b/git-add.html
@@ -778,7 +778,8 @@ This lets you choose one path out of a <em>status</em> like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage - the change of each hunk. You can say: + the change of each hunk. You can select one of the following + options and type return: </p> <div class="literalblock"> <div class="content"> @@ -799,6 +800,8 @@ </div></div> <div class="paragraph"><p>After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks.</p></div> +<div class="paragraph"><p>You can omit having to type return here, by setting the configuration +variable <tt>interactive.singlekey</tt> to <tt>true</tt>.</p></div> </dd> <dt class="hdlist1"> diff @@ -930,7 +933,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-05-05 01:29:54 UTC +Last updated 2011-05-11 20:08:54 UTC </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index 35cb5d3..9c1d395 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -274,7 +274,8 @@ This lets you choose one path out of a 'status' like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage - the change of each hunk. You can say: + the change of each hunk. You can select one of the following + options and type return: y - stage this hunk n - do not stage this hunk @@ -293,6 +294,9 @@ + After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks. ++ +You can omit having to type return here, by setting the configuration +variable `interactive.singlekey` to `true`. diff::
diff --git a/git-checkout.html b/git-checkout.html index 9620150..1cb4910 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -419,7 +419,7 @@ <em>git checkout</em> [-q] [-f] [-m] [--detach] [<commit>] <em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>] <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>… -<em>git checkout</em> --patch [<tree-ish>] [--] [<paths>…]</div> +<em>git checkout</em> [-p|--patch] [<tree-ish>] [--] [<paths>…]</div> <div class="verseblock-attribution"> </div></div> </div> @@ -460,7 +460,7 @@ successful.</p></div> </dd> <dt class="hdlist1"> -<em>git checkout</em> [--patch] [<tree-ish>] [--] <pathspec>… +<em>git checkout</em> [-p|--patch] [<tree-ish>] [--] <pathspec>… </dt> <dd> <p> @@ -672,7 +672,8 @@ working tree (and if a <tree-ish> was specified, the index). </p> <div class="paragraph"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard -edits from your current working tree.</p></div> +edits from your current working tree. See the “Interactive Mode” +section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div> </dd> <dt class="hdlist1"> <branch> @@ -958,7 +959,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-03-15 23:30:13 UTC +Last updated 2011-05-11 20:08:54 UTC </div> </div> </body>
diff --git a/git-checkout.txt b/git-checkout.txt index 1063f69..c0a96e6 100644 --- a/git-checkout.txt +++ b/git-checkout.txt
@@ -12,7 +12,7 @@ 'git checkout' [-q] [-f] [-m] [--detach] [<commit>] 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>] 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>... -'git checkout' --patch [<tree-ish>] [--] [<paths>...] +'git checkout' [-p|--patch] [<tree-ish>] [--] [<paths>...] DESCRIPTION ----------- @@ -45,7 +45,7 @@ that is to say, the branch is not reset/created unless "git checkout" is successful. -'git checkout' [--patch] [<tree-ish>] [--] <pathspec>...:: +'git checkout' [-p|--patch] [<tree-ish>] [--] <pathspec>...:: When <paths> or `--patch` are given, 'git checkout' does *not* switch branches. It updates the named paths in the working tree @@ -183,7 +183,8 @@ working tree (and if a <tree-ish> was specified, the index). + This means that you can use `git checkout -p` to selectively discard -edits from your current working tree. +edits from your current working tree. See the ``Interactive Mode'' +section of linkgit:git-add[1] to learn how to operate the `\--patch` mode. <branch>:: Branch to checkout; if it refers to a branch (i.e., a name that,
diff --git a/git-config.html b/git-config.html index 2d0c5b0..3300e28 100644 --- a/git-config.html +++ b/git-config.html
@@ -3224,8 +3224,9 @@ <p> In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). - Currently this is used only by the <tt>--patch</tt> mode of - <a href="git-add.html">git-add(1)</a>. Note that this setting is silently + Currently this is used by the <tt>--patch</tt> mode of + <a href="git-add.html">git-add(1)</a>, <a href="git-reset.html">git-reset(1)</a>, <a href="git-stash.html">git-stash(1)</a> and + <a href="git-checkout.html">git-checkout(1)</a>. Note that this setting is silently ignored if portable keystroke input is not available. </p> </dd>
diff --git a/git-reset.html b/git-reset.html index 4df4dd6..0f24114 100644 --- a/git-reset.html +++ b/git-reset.html
@@ -416,7 +416,7 @@ <div class="sectionbody"> <div class="verseblock"> <div class="verseblock-content"><em>git reset</em> [-q] [<commit>] [--] <paths>… -<em>git reset</em> --patch [<commit>] [--] [<paths>…] +<em>git reset</em> [--patch|-p] [<commit>] [--] [<paths>…] <em>git reset</em> [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]</div> <div class="verseblock-attribution"> </div></div> @@ -455,8 +455,9 @@ and <commit> (defaults to HEAD). The chosen hunks are applied in reverse to the index. </p> -<div class="paragraph"><p>This means that <tt>git reset -p</tt> is the opposite of <tt>git add -p</tt> (see -<a href="git-add.html">git-add(1)</a>).</p></div> +<div class="paragraph"><p>This means that <tt>git reset -p</tt> is the opposite of <tt>git add -p</tt>, i.e. +you can use it to selectively reset hunks. See the “Interactive Mode” +section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div> </dd> <dt class="hdlist1"> <em>git reset</em> [--<mode>] [<commit>] @@ -1000,7 +1001,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-03-15 23:30:14 UTC +Last updated 2011-05-11 20:08:54 UTC </div> </div> </body>
diff --git a/git-reset.txt b/git-reset.txt index 8481f9d..b2832fc 100644 --- a/git-reset.txt +++ b/git-reset.txt
@@ -9,7 +9,7 @@ -------- [verse] 'git reset' [-q] [<commit>] [--] <paths>... -'git reset' --patch [<commit>] [--] [<paths>...] +'git reset' [--patch|-p] [<commit>] [--] [<paths>...] 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION @@ -39,8 +39,9 @@ and <commit> (defaults to HEAD). The chosen hunks are applied in reverse to the index. + -This means that `git reset -p` is the opposite of `git add -p` (see -linkgit:git-add[1]). +This means that `git reset -p` is the opposite of `git add -p`, i.e. +you can use it to selectively reset hunks. See the ``Interactive Mode'' +section of linkgit:git-add[1] to learn how to operate the `\--patch` mode. 'git reset' [--<mode>] [<commit>]:: This form resets the current branch head to <commit> and
diff --git a/git-stash.html b/git-stash.html index 657f70b..65e42d8 100644 --- a/git-stash.html +++ b/git-stash.html
@@ -420,7 +420,7 @@ <em>git stash</em> drop [-q|--quiet] [<stash>] <em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [<stash>] <em>git stash</em> branch <branchname> [<stash>] -<em>git stash</em> [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] +<em>git stash</em> [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] <em>git stash</em> clear <em>git stash</em> create</div> <div class="verseblock-attribution"> @@ -449,7 +449,7 @@ <div class="sectionbody"> <div class="dlist"><dl> <dt class="hdlist1"> -save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>] +save [-p|--patch] [--[no-]keep-index] [-q|--quiet] [<message>] </dt> <dd> <p> @@ -462,12 +462,13 @@ </p> <div class="paragraph"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the index are left intact.</p></div> -<div class="paragraph"><p>With <tt>--patch</tt>, you can interactively select hunks from in the diff +<div class="paragraph"><p>With <tt>--patch</tt>, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back -from your worktree.</p></div> +from your worktree. See the “Interactive Mode” section of +<a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div> <div class="paragraph"><p>The <tt>--patch</tt> option implies <tt>--keep-index</tt>. You can use <tt>--no-keep-index</tt> to override this.</p></div> </dd> @@ -713,7 +714,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-03-15 23:30:14 UTC +Last updated 2011-05-11 20:08:54 UTC </div> </div> </body>
diff --git a/git-stash.txt b/git-stash.txt index 79abc38..15f051f 100644 --- a/git-stash.txt +++ b/git-stash.txt
@@ -13,7 +13,7 @@ 'git stash' drop [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] +'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] 'git stash' clear 'git stash' create @@ -42,7 +42,7 @@ OPTIONS ------- -save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]:: +save [-p|--patch] [--[no-]keep-index] [-q|--quiet] [<message>]:: Save your local modifications to a new 'stash', and run `git reset --hard` to revert them. The <message> part is optional and gives @@ -54,12 +54,13 @@ If the `--keep-index` option is used, all changes already added to the index are left intact. + -With `--patch`, you can interactively select hunks from in the diff +With `--patch`, you can interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back -from your worktree. +from your worktree. See the ``Interactive Mode'' section of +linkgit:git-add[1] to learn how to operate the `\--patch` mode. + The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this.
